Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add 4 New Mining Materials #1693

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Add 4 New Mining Materials #1693

wants to merge 19 commits into from

Conversation

VMSolidus
Copy link
Member

@VMSolidus VMSolidus commented Jan 31, 2025 •
edited
Loading

Description

This PR adds 4 new materials for use with lathe recipes. As well as plenty of assets to implement more as we need. Nothing actually currently uses these yet, so they're just sellable for now. Eventually we're going to start differentiating ore loot by biome, so that we can

TODO

Media

new materials

image

image

new ores
image

Changelog

🆑

  • add: Added lathe and ore processor materials for Lead, Aluminium, Copper, Tungsten-Carbide, and Circuitry. Only Tungsten-Carbide currently has a use.
  • add: Tacsuits now require Tungsten-Carbide to make instead of Plasteel, and require a lot less.
  • add: Reworked ore drops for Lava planets. Lava planets now have random ores that drop from any rock, but with their own drop table. Iron & Gold are "Plentiful" on lava planets, with moderate amounts of Aluminium and Tungsten. All other ores are very rare from Lava rocks.
  • add: Energy Swords can now be manufactured at a Secfab after researching Arsenal T3 Prototype Weapons

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Localization Changes any ftl files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Jan 31, 2025
@SimpleStation14 SimpleStation14 changed the title Add 4 new mining materials Add 4 New Mining Materials Jan 31, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 31, 2025 •
edited
Loading

RSI Diff Bot; head commit c5ae8aa merging into c7ded91
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Materials/ingots.rsi

State Old New Status
tungsten_1 Added
tungsten_2 Added
tungsten_3 Added

Resources/Textures/Objects/Materials/ore.rsi

State Old New Status
tungsten Added

Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi

State Old New Status
aluminium Added
bluewire Added
bluewire_2 Added
bluewire_3 Added
brass Added
bullets Added
casings Added
ceramic Added
ceramic_2 Added
ceramic_3 Added
circuits Added
circuits_2 Added
circuits_3 Added
cloth Added
coal Added
copper Added
firewood Added
firewood_2 Added
firewood_3 Added
gold Added
greenwire Added
greenwire_2 Added
greenwire_3 Added
ingot_aluminum Added
ingot_brass Added
ingot_copper Added
ingot_gold Added
ingot_iron Added
ingot_lead Added
ingot_silver Added
iron Added
lead Added
leather_1 Added
leather_2 Added
leather_3 Added
log Added
militaryfiber Added
nail Added
nail_2 Added
nail_3 Added
nail_4 Added
plank Added
plank_2 Added
plank_3 Added
plastic Added
powder_aluminum Added
powder_brass Added
powder_copper Added
powder_gold Added
powder_lead Added
powder_silver Added
powder_steel Added
raw_leather_1 Added
raw_leather_2 Added
redwire Added
redwire_2 Added
redwire_3 Added
rubber Added
scrap Added
scrap_2 Added
scrap_3 Added
scrap_aluminum Added
scrap_brass Added
scrap_clockwork Added
scrap_copper Added
scrap_electronic Added
scrap_electronic_2 Added
scrap_electronic_3 Added
scrap_glass Added
scrap_glass_2 Added
scrap_glass_3 Added
scrap_gold Added
scrap_lead Added
scrap_parts Added
scrap_parts_2 Added
scrap_parts_3 Added
scrap_silver Added
scrap_steel Added
scrap_steel_2 Added
scrap_steel_3 Added
scrap_wood Added
silver Added
sulfur Added
thread Added
uranium Added
yellowwire Added
yellowwire_2 Added
yellowwire_3 Added

Edit: diff updated after c5ae8aa

@Erisfiregamer1
Copy link
Contributor

Tungsten Carbide is next? (Shit I have to speedrun Scrap Processing)

@sleepyyapril
Copy link
Contributor

Next up, using parenting for lathe recipes

@VMSolidus
Copy link
Member Author

Tungsten is in now.

@stellar-novas
Copy link
Contributor

add: Added lathe and ore processor materials for Lead, Aluminium, Copper, Tungsten-Carbide, and Circuitry. No recipes currently use these, so they're just sellable for now.
add: Tacsuits now require Tungsten-Carbide to make instead of Plasteel, and require a lot less.

Contradicting, fix da CL when done

@VMSolidus
Copy link
Member Author

add: Added lathe and ore processor materials for Lead, Aluminium, Copper, Tungsten-Carbide, and Circuitry. No recipes currently use these, so they're just sellable for now.
add: Tacsuits now require Tungsten-Carbide to make instead of Plasteel, and require a lot less.

Contradicting, fix da CL when done

This PR has actually been done for 3 days now lol.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DEATHB4DEFEAT DEATHB4DEFEAT Awaiting requested review from DEATHB4DEFEAT DEATHB4DEFEAT is a code owner

@sleepyyapril sleepyyapril Awaiting requested review from sleepyyapril sleepyyapril is a code owner

@Remuchi Remuchi Awaiting requested review from Remuchi Remuchi is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@VMSolidus @Erisfiregamer1 @sleepyyapril @stellar-novas